dm: unify obj-$(CONFIG_DM) and obj-$(CONFIG_SPL_DM) entries

Signed-off-by: Masahiro Yamada <[email protected]>
Reviewed-by: Tom Rini <[email protected]>
Reviewed-by: Simon Glass <[email protected]>

diff --git a/drivers/Makefile b/drivers/Makefile
index a24c5f5cce21d4e98c8e2a55e5e20056e8b1f22a..ee8e4185bb36c251ce968ad0997b67cf6b06c2dd 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -1,7 +1,8 @@
+obj-$(CONFIG_$(SPL_)DM)                += core/
+
 ifdef CONFIG_SPL_BUILD
 
 obj-$(CONFIG_SPL_CLK_SUPPORT) += clk/
-obj-$(CONFIG_SPL_DM) += core/
 obj-$(CONFIG_SPL_I2C_SUPPORT) += i2c/
 obj-$(CONFIG_SPL_GPIO_SUPPORT) += gpio/
 obj-$(CONFIG_SPL_MMC_SUPPORT) += mmc/
@@ -34,7 +35,6 @@ obj-$(CONFIG_SPL_SATA_SUPPORT) += block/
 else
 
 obj-$(CONFIG_CLK) += clk/
-obj-$(CONFIG_DM) += core/
 obj-$(CONFIG_DM_DEMO) += demo/
 obj-$(CONFIG_BIOSEMU) += bios_emulator/
 obj-y += block/